With this few changes now we can require email confirmation even when we does not use email as login.
Now its possible:

• Use username and require email confirmation
• Use username and do not require email confirmation
• Use email as login and require email confirmation
• Use email as login and do not require email confirmation